306. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-05-13 09:09:07 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

306.1 Files compared

#	Location	File	Last Modified
1	/Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_Porto	requirejs-config.js	2020-08-16 03:21:14 +0000
2	/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_Porto	requirejs-config.js	2021-04-13 15:52:44 +0000

306.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	4	16
Changed	2	10
Inserted	0	0
Removed	1	3

306.3 Comparison options

Whitespace	Consecutive whitespace is treated as a single space
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
CR/LF characters	Not shown in the comparison detail
Active line-pairing rules

306.4 Active regular expressions

No regular expressions were active.

306.5 Comparison detail

1	var config = {	1	var config = {
2	paths: {	2	paths: {
3	'imagesloaded': 'Smartwave_Porto/js/imagesloaded',	3	'imagesloaded': 'Smartwave_Porto/js/imagesloaded',
4	'packery': 'Smartwave_Porto/js/packery.pkgd',	4	'packery': 'Smartwave_Porto/js/packery.pkgd'
5	'instafeed': 'Smartwave_Porto/js/instafeed.min'
6	},	5	},
7	shim: {	6	shim: {
8	'imagesloaded': {
9	deps: ['jquery']
10	},
11	'packery': {	7	'packery': {
12	deps: ['jquery']	8	deps: ['jquery','imagesloaded']
13	},	9	}
14	'instafeed': {
15	deps: ['jquery' ]
16	}
17	}	10	}
18	};	11	};